From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 19 Feb 2011 06:25:05 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~2383^2~2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=f12f551b2c38748ed10ec8c350faa23516f7c705;p=emacs.git

Merge from mainline.
---

f12f551b2c38748ed10ec8c350faa23516f7c705